Cleaned up Project Structure a bit...has to be