removed 'master' directory and moved everything up