Removed components and imports folders, fixed #15