Organized files between development and master
Updated release script to base off master