Simplify validation
Rename app_dir to sources_dir
WIP