Re-organized the main directory