Refactor: Create Stateless Components, move components to a new package