Removed unnecessary files, introduced folder structure