Change folder structure.
Lots of code thrown. Looks like working.