changed source file structure