Continue separation of sources and put also html5 into separated dir