Organized files into different packages