Added basic Entities, Logic Edited some controllers and components