Cleaned code

Combined files and cleaned up programs