Organized Files / condensing code