Remove lib dir
remove uneccessary requires
reorganize files