[src] new structure; changed file handling