removed extra dir, moved all code under src dir