Extracted code to different files