Project management : Moved some misplaced methods, applied minor refactor on them.