Added folders to make the code layout cleaner. In preparation for MVVM refactor.