moved forms in a dedicated package
fixed name of the apartment account