Changed file structure to support sections