Moved main components to separate folder