Reorganized file structure for easier installation