updated packagee structure and added imports