[FIX] Fixes #2
[IMP] Reordering folders to Vauxoo's standards.