Fixed directory structure and removed bootstrap