Changed location of files, fixed src folders in eclipse