Directory reshuffle to work on a default apache configuration