Started refactoring code - Every component is moved in their own file.