Removed weird directory structure