Remove excess whitespace
Restructure project