Initial commit
revamped config files
Merge branch 'revamp'