new file structure for easier installation