small changes
Merge branch 'master' into revised_file_structure
adding revision with working aces
added tests for ace fix
Merge pull request #6 from devin-liu/revised_file_structure

Revised file structure