fixed project settings and moved file

Change-Id: I14985f81cd3a90cbe159b959054c7212d331fe36