Removed obsolete files & merged a bit