moved components into Components folder, few code tweaks