Changed Project Structure. Fixed Package.