Changed file structure to accomodate EJB beans