Reorganizing Files for better testing

Working on unit tests