Started to move functionality parts in modules