Further clean-up to the repo for better file structure

Further clean-up to the repo for better file structure