renamed app to src
merged