Organization

Changes in the file organization