re-organized folder layout