Re-factor folder layout