Clear up directory structure, remove website from master