Fix all files docblock
Fix major refactoring bugs