removed test dir and cleaned up application structure