Commit changes

@3h0m refactoring structure