Reorganized

Added class, src subfolders