Strip unnecesary folder structure. Make everything cleaner