Restructured folders. Solves #11

Solves #11