Changed file structure for more readability