Project re-architected

Re-architected project layout to reduce file duplication
Should help with keeping server and client files consistant