Change file structure for better modularity