Adding everything to Master, cleaned up folder