Altered folder structure to make import easier