Cleaned up directory structure a bit