Reorganize + Bug fixes