Changed folder structure to be easier to integrate to another project.