Removed bootstrap files and started cleaning up