Changed some options, cleaned up directory structure