Rearranging project structure for better readability. See Readme