Changes folder structure

Made things cleaner