Cleaned up repo and moved about and diclamier to resp folders