Change in how file structure, and added dark magic