moved Echo.java to correct location. Removed obsolete folder structure