Merged app and public js folder