restructuring files/packages for better code understanding