Restructure and rename to fit my project