UI tweaking
Project structure rearranged