Cleaned up and setup folders and basic stuff as wanted