Massive change in file structer. And removed lots of extra files