Moving files to src directory, added two tests booya