Cleaned up files and merged into README