changed overall file structure