Adds a major refactor of folder structure