Re-organized folders for easy installation process