Fixed names formatting; changed structure a bit
Merge branch 'feature/better-naming'