refactoring using more specific methods to later handle projects as well
first rough version of project support! #2
Update documentation and fix indentation